From 5a078f4688859e4a7f2321da4f2f4eea3f84ffc3 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 11 Jan 2023 22:47:49 +0100 Subject: [PATCH] fix build failures with JUCE-7.0.2 Origin: Debian Bug: https://github.com/monocasual/giada/issues/604 Last-Update: 2022-08-19 Last-Update: 2022-08-19 Gbp-Pq: Name juce-7_0_2.patch --- CMakeLists.txt | 1 + src/core/plugins/pluginHost.cpp | 13 +++++++------ src/core/plugins/pluginHost.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e76388..c8d74f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -575,6 +575,7 @@ endif() # ------------------------------------------------------------------------------ # Finalize 'giada' target (main executable). # ------------------------------------------------------------------------------ +list(APPEND LIBRARIES z) add_executable(giada) target_compile_features(giada PRIVATE ${COMPILER_FEATURES}) diff --git a/src/core/plugins/pluginHost.cpp b/src/core/plugins/pluginHost.cpp index 4d8c724..b6116d1 100644 --- a/src/core/plugins/pluginHost.cpp +++ b/src/core/plugins/pluginHost.cpp @@ -49,14 +49,15 @@ PluginHost::Info::Info(const Sequencer& s, int sampleRate) /* -------------------------------------------------------------------------- */ -bool PluginHost::Info::getCurrentPosition(CurrentPositionInfo& result) +juce::Optional PluginHost::Info::getPosition() const { - result.bpm = m_sequencer.getBpm(); - result.timeInSamples = m_sequencer.getCurrentFrame(); - result.timeInSeconds = m_sequencer.getCurrentSecond(m_sampleRate); - result.isPlaying = m_sequencer.isRunning(); + juce::Optional info; + info->setBpm (m_sequencer.getBpm()); + info->setTimeInSamples (m_sequencer.getCurrentFrame()); + info->setTimeInSeconds (m_sequencer.getCurrentSecond(m_sampleRate)); + info->setIsPlaying (m_sequencer.isRunning()); - return true; + return info; } /* -------------------------------------------------------------------------- */ diff --git a/src/core/plugins/pluginHost.h b/src/core/plugins/pluginHost.h index 2663690..40288c3 100644 --- a/src/core/plugins/pluginHost.h +++ b/src/core/plugins/pluginHost.h @@ -60,7 +60,7 @@ public: public: Info(const Sequencer&, int sampleRate); - bool getCurrentPosition(CurrentPositionInfo& result) override; + juce::Optional getPosition() const override; bool canControlTransport() override; private: -- 2.30.2